From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun, 11 Sep 2011 17:08:17 +0000 (+0200)
Subject: * lisp/dired.el (dired-sort-toggle-or-edit): Revert last changes.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2315
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d7aeb22ab4356f53c54996aff156949c90c88eee;p=emacs.git

* lisp/dired.el (dired-sort-toggle-or-edit): Revert last changes.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e6ad6cac0d9..d9ec21d467e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* dired.el (dired-sort-toggle-or-edit): Revert last changes.
+
 2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* dired.el (dired-sort-toggle-or-edit): -o doesn't exist on *BSD,
diff --git a/lisp/dired.el b/lisp/dired.el
index 679a32734e7..ecb626a275e 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3413,8 +3413,7 @@ With a prefix argument, edit the current listing switches instead."
     (error "Cannot sort this dired buffer"))
   (if arg
       (dired-sort-other
-       (read-string "ls switches (must contain -l or similar): "
-		    dired-actual-switches))
+       (read-string "ls switches (must contain -l): " dired-actual-switches))
     (dired-sort-toggle)))
 
 (defun dired-sort-toggle ()